⚠️ CONFLICT! Lineage pull request for: skeleton #26

cisagovbot · 2023-11-29T09:44:20Z

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an
upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-tf-module.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with
your project.

The lineage/skeleton branch has one or more unresolved merge conflicts
that you must resolve before merging this pull request!

How to resolve the conflicts

Take ownership of this pull request by removing any other assignees.

Clone the repository locally, and reapply the merge:

git clone [email protected]:cisagov/cool-assessment-provisioner-iam.git cool-assessment-provisioner-iam
cd cool-assessment-provisioner-iam
git remote add skeleton https://github.com/cisagov/skeleton-tf-module.git
git remote set-url --push skeleton no_push
git switch develop
git switch --create lineage/skeleton --track origin/develop
git pull skeleton HEAD
git status

Review the changes displayed by the status command. Fix any conflicts and
possibly incorrect auto-merges.
After resolving each of the conflicts, add your changes to the
branch, commit, and push your changes:
```
git add .github/dependabot.yml README.md examples/basic_usage/README.md examples/basic_usage/versions.tf 
git commit
git push --force --set-upstream origin lineage/skeleton
```
Note that you may append to the default merge commit message
that git creates for you, but please do not delete the existing
content. It provides useful information about the merge that is
being performed.
Wait for all the automated tests to pass.
Confirm each item in the "Pre-approval checklist" below.
Remove any of the checklist items that do not apply.
Ensure every remaining checkbox has been checked.
Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

Remove any of the following that do not apply. If you're unsure about
any of these, don't hesitate to ask. We're here to help!

✌️ The conflicts in this pull request have been resolved.
All relevant type-of-change labels have been added.
All new and existing tests pass.

Note

You are seeing this because one of this repository's maintainers has
configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

Co-authored-by: Nick <[email protected]>

This is being done for testing purposes, and this commit can be reverted (or removed) once cisagov/setup-env-github-action#65 is merged.

Co-authored-by: Nick <[email protected]>

The repo name we were using redirects to the correct place, but we may as well cut out the middle man.

@mcdonnnj

…orrect staticcheck package URL Co-Authored By: @mcdonnnj <[email protected]>

Co-authored-by: Shane Frasier <[email protected]>

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value.

Our standard practice for YAML files is to sort keys alphabetically.

Co-authored-by: David Harris <[email protected]>

Co-authored-by: Nick <[email protected]>

…b-action" This reverts commit ddbf6f7. This can be done now that cisagov/setup-env-github-action#65 has been merged.

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Add crazy-max/ghaction-github-labeler as a commented out dependency to ignore in the dependabot configuration file. This should be enabled in downstream projects to consolidate updating this Action to the cisagov/skeleton-generic repository.

Add go packages for pre-commit

Use the correct repo name for the ansible-lint pre-commit hook

…nfiguration Update the Dependabot configuration

Delete duplicate word "are"

Add nixfmt pre-commit hook

…s/checkout-4 Bump actions/checkout from 3 to 4

⚠️ CONFLICT! Lineage pull request for: skeleton

…er_v4 Update hashicorp/aws requirement from ~> 3.75 to ~> 4.9

…onfiguration Add a configuration file for `terraform-docs`

…e/skeleton

jasonodoom and others added 30 commits July 10, 2023 12:52

Add steps to setup go packages for pre-commit

4cb9a4b

Update action/checkout to use same version

53f56b0

Set specific gocritic version

f261099

Update build workflow with package installtion

097b573

Group go tools together with comment

254282a

Update staticcheck id

ecf3299

Co-authored-by: Nick <[email protected]>

Update tool names to match author stylization

1eaedf5

Co-authored-by: Nick <[email protected]>

Update statcicheck stylization

fd04757

Co-authored-by: Nick <[email protected]>

Temporarily use a different branch of cisagov/setup-env-github-action

ddbf6f7

This is being done for testing purposes, and this commit can be reverted (or removed) once cisagov/setup-env-github-action#65 is merged.

Move go packages install to separate section

a8af336

Update go-critic name

1675b12

Co-authored-by: Nick <[email protected]>

Update staticcheck name

c6ab22e

Co-authored-by: Nick <[email protected]>

Use the correct repo name for the ansible-lint pre-commit hook

29de034

The repo name we were using redirects to the correct place, but we may as well cut out the middle man.

Correct staticcheck reference to setup-env, sort alphabetically and c…

1e7cb4f

…orrect staticcheck package URL Co-Authored By: @mcdonnnj <[email protected]>

Remove Go section coment

5f3bc13

Co-authored-by: Shane Frasier <[email protected]>

Remove unnecessary quotes in the dependabot configuration

d311825

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value.

Sort the keys in the Dependabot configuration

2294d49

Our standard practice for YAML files is to sort keys alphabetically.

Delete duplicate word "are"

e678502

Co-authored-by: David Harris <[email protected]>

Fix gosec stylization

948ebde

Co-authored-by: Nick <[email protected]>

Revert "Temporarily use a different branch of cisagov/setup-env-githu…

98d3d3f

…b-action" This reverts commit ddbf6f7. This can be done now that cisagov/setup-env-github-action#65 has been merged.

Add nixfmt pre-commit hook

82db36a

Bump crazy-max/ghaction-github-labeler from 4 to 5

b04654e

Update the dependabot ignore configuration

49ac8c5

Add crazy-max/ghaction-github-labeler as a commented out dependency to ignore in the dependabot configuration file. This should be enabled in downstream projects to consolidate updating this Action to the cisagov/skeleton-generic repository.

Merge pull request #138 from cisagov/add-go-packages

4ec50ab

Add go packages for pre-commit

Merge pull request #139 from cisagov/improvement/use-correct-repo-name

8145a93

Use the correct repo name for the ansible-lint pre-commit hook

Merge pull request #140 from cisagov/improvement/update_dependabot_co…

ce74358

…nfiguration Update the Dependabot configuration

Merge pull request #141 from cisagov/documentation/grammar

338e3e1

Delete duplicate word "are"

Merge pull request #143 from cisagov/add-nixfmt

8432f1e

Add nixfmt pre-commit hook

Merge pull request #145 from cisagov/dependabot/github_actions/action…

8cdbc7b

…s/checkout-4 Bump actions/checkout from 3 to 4

mcdonnnj added 3 commits November 29, 2023 09:05

Merge pull request #187 from cisagov/lineage/skeleton

c12915d

⚠️ CONFLICT! Lineage pull request for: skeleton

Merge pull request #188 from cisagov/improvement/update_to_aws_provid…

6397a1c

…er_v4 Update hashicorp/aws requirement from ~> 3.75 to ~> 4.9

Merge pull request #189 from cisagov/improvement/add_terraform-docs_c…

ca595f9

…onfiguration Add a configuration file for `terraform-docs`

cisagovbot assigned dav3r, felddy, jasonodoom, jsf9k and mcdonnnj Nov 29, 2023

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Nov 29, 2023

jsf9k unassigned felddy, jasonodoom, dav3r and mcdonnnj Dec 1, 2023

jsf9k added documentation This issue or pull request improves or adds to documentation terraform Pull requests that update Terraform code github-actions Pull requests that update GitHub Actions code labels Dec 1, 2023

Merge remote-tracking branch 'skeleton-tf-module/develop' into lineag…

4ae7af7

…e/skeleton

jsf9k force-pushed the lineage/skeleton branch from 94a068b to 4ae7af7 Compare December 1, 2023 14:33

jsf9k marked this pull request as ready for review December 1, 2023 14:41

jsf9k requested review from dav3r, felddy, jasonodoom, jsf9k and mcdonnnj as code owners December 1, 2023 14:41

jsf9k enabled auto-merge December 1, 2023 14:41

jsf9k requested a review from a team December 1, 2023 14:41

dav3r approved these changes Dec 4, 2023

View reviewed changes

dv4harr10 approved these changes Dec 4, 2023

View reviewed changes

jsf9k merged commit 3235e1f into develop Dec 4, 2023
6 checks passed

jsf9k deleted the lineage/skeleton branch December 4, 2023 16:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

⚠️ CONFLICT! Lineage pull request for: skeleton #26

⚠️ CONFLICT! Lineage pull request for: skeleton #26

cisagovbot commented Nov 29, 2023 •

edited by jsf9k

Loading

⚠️ CONFLICT! Lineage pull request for: skeleton #26

⚠️ CONFLICT! Lineage pull request for: skeleton #26

Conversation

cisagovbot commented Nov 29, 2023 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

cisagovbot commented Nov 29, 2023 •

edited by jsf9k

Loading